Persist the VLAN setting.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xend/XendNode.py b/tools/python/xen/xend/XendNode.py
index 503381804527575f7e7a8c7647d3537fde749c21..4bd2d7ec01c7c7d3e2f677f6194ee608090ceb6f 100644 (file)
--- a/tools/python/xen/xend/XendNode.py
+++ b/tools/python/xen/xend/XendNode.py
@@ -107,6 +107,7 @@ class XendNode:
                     self.pifs[pif_uuid] = XendPIF(pif_uuid,
                                                   pif['name'],
                                                   pif['MTU'],
+                                                  pif['VLAN'],
                                                   pif['MAC'],
                                                   network,
                                                   self)
@@ -114,7 +115,7 @@ class XendNode:
             for name, mtu, mac in linux_get_phy_ifaces():
                 network = self.networks.values()[0]
                 pif_uuid = uuid.createString()
-                pif = XendPIF(pif_uuid, name, mtu, mac, network, self)
+                pif = XendPIF(pif_uuid, name, mtu, '', mac, network, self)
                 self.pifs[pif_uuid] = pif
 
         # initialise storage

diff --git a/tools/python/xen/xend/XendPIF.py b/tools/python/xen/xend/XendPIF.py
index 32c4b3626b291ec70901e819f94769a3f14a2b74..c3aed064277d0ff19a8dbc79ef1ce27993b7e40b 100644 (file)
--- a/tools/python/xen/xend/XendPIF.py
+++ b/tools/python/xen/xend/XendPIF.py
@@ -99,12 +99,12 @@ def same_dir_rename(old_path, new_path):
 class XendPIF:
     """Representation of a Physical Network Interface."""
     
-    def __init__(self, uuid, name, mtu, mac, network, host):
+    def __init__(self, uuid, name, mtu, vlan, mac, network, host):
         self.uuid = uuid
         self.name = name
         self.mac = mac
         self.mtu = mtu
-        self.vlan = ''
+        self.vlan = vlan
         self.network = network
         self.host = host
 
@@ -132,11 +132,11 @@ class XendPIF:
     def get_record(self, transient = True):
         result = {'name': self.name,
                   'MAC': self.mac,
-                  'MTU': self.mtu,
+                  'MTU': str(self.mtu),
                   'VLAN': self.vlan,
                   'host': self.host.uuid,
                   'network': self.network.uuid}
         if transient:
-            result['io_read_kbs'] = self.get_io_read_kbs()
-            result['io_write_kbs'] = self.get_io_write_kbs()
+            result['io_read_kbs'] = str(self.get_io_read_kbs())
+            result['io_write_kbs'] = str(self.get_io_write_kbs())
         return result